keyboard.c (read_char): Return after executing from special map.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5b5b1533f762f1c42562b5a3d3bc0ae75d160bbe..392b9550eda3d3b67aab8fb7ee6708394d7d7901 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-12  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * keyboard.c (read_char): Return after executing from special map.
+
 2010-01-12  Glenn Morris  <rgm@gnu.org>
 
        * emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Set it to

diff --git a/src/keyboard.c b/src/keyboard.c
index 13d13cd3276944cae889a84153cbc716a1b13867..8bd8cf304681dfcbf453d0e75da2248e4be612bb 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3178,7 +3178,10 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
       unbind_to (count, Qnil);
 #endif
 
-      goto retry;
+      /* The command may have changed the keymaps.  Pretend there is input
+         in another keyboard and return.  This will recalculate keymaps.  */
+      c = make_number (-2);
+      goto exit;
     }
 
   /* Handle things that only apply to characters.  */